diff --git a/internal/game/gamebuild.go b/internal/game/gamebuild.go
index 36c1ac8..19ba956 100644
--- a/internal/game/gamebuild.go
+++ b/internal/game/gamebuild.go
@@ -138,7 +138,8 @@ func (s *GameStateBuild) Begin(g *Game) {
 	}
 	g.ui.equipmentPanel.buyButton.text.SetText(fmt.Sprintf("Random Loot\n%dgp", s.EquipmentCost()))
 	g.ui.equipmentPanel.buyButton.Enable()
-
+	g.ui.equipmentPanel.sortButton.Enable()
+	g.ui.equipmentPanel.autoEquipButton.Enable()
 	g.ui.equipmentPanel.onItemClick = func(which int) {
 		g.ui.equipmentPanel.list.selected = which
 		s.selectedEquipment = which
@@ -316,7 +317,9 @@ func (s *GameStateBuild) End(g *Game) {
 	g.ui.roomInfoPanel.hidden = true
 	g.ui.roomPanel.buyButton.disabled = true
 	g.ui.dudePanel.buyButton.disabled = true
+	g.ui.equipmentPanel.autoEquipButton.disabled = true
 	g.ui.equipmentPanel.buyButton.disabled = true
+	g.ui.equipmentPanel.sortButton.disabled = true
 	g.ui.dudeInfoPanel.equipmentDetails.sellButton.hidden = true
 	g.ui.dudeInfoPanel.equipmentDetails.swapButton.hidden = true
 }
diff --git a/internal/game/gamepre.go b/internal/game/gamepre.go
index f3d02fa..9e2a09f 100644
--- a/internal/game/gamepre.go
+++ b/internal/game/gamepre.go
@@ -70,6 +70,13 @@ func (s *GameStatePre) Begin(g *Game) {
 
 	// Init inventory
 	g.equipment = make([]*Equipment, 0)
+	g.ui.equipmentPanel.SetEquipment(g.equipment)
+
+	// Init dudes
+	g.dudes = make([]*Dude, 0)
+	g.ui.dudeInfoPanel.SetDude(nil)
+	g.ui.dudePanel.SetDudes(g.dudes)
+	g.ui.dudeInfoPanel.equipmentDetails.SetEquipment(nil)
 
 	// Init audio tick
 	g.audioController.PlayRoomTracks()
diff --git a/internal/game/ui.go b/internal/game/ui.go
index 42bc71f..9afa7c2 100644
--- a/internal/game/ui.go
+++ b/internal/game/ui.go
@@ -230,7 +230,7 @@ func (ui *UI) Layout(o *UIOptions) {
 	)
 	ui.bossPanel.panel.SetPosition(
 		float64(o.Width)/2-ui.bossPanel.panel.Width()/2,
-		float64(o.Height)/8-ui.bossPanel.panel.Height()/2,
+		float64(o.Height)/8-ui.bossPanel.panel.Height()/2+4*o.Scale,
 	)
 	ui.bossPanel.panel.padding = 3 * o.Scale
 	ui.bossPanel.Layout(o)
@@ -1439,10 +1439,12 @@ func (ep *EquipmentPanel) Draw(o *render.Options) {
 	if ep.showDetails {
 		ep.details.Draw(o)
 	}
-	ep.autoEquipButton.Draw(o)
-	ep.buyButton.Draw(o)
-	ep.sortButton.Draw(o)
 
+	ep.buyButton.Draw(o)
+	if ep.equipment != nil && len(ep.equipment) != 0 {
+		ep.autoEquipButton.Draw(o)
+		ep.sortButton.Draw(o)
+	}
 }
 
 type EquipmentDetailsPanel struct {
@@ -1973,7 +1975,7 @@ func (bp *BossPanel) Layout(o *UIOptions) {
 	bp.text.Layout(nil, o)
 	bp.panel.Layout(nil, o)
 	// Force text's position
-	bp.text.SetPosition(bp.panel.X()+bp.panel.Width()/2-bp.text.Width()/2, bp.panel.Y()+bp.panel.Height()/2-bp.text.Height()/2-3)
+	bp.text.SetPosition(bp.panel.X()+bp.panel.Width()/2-bp.text.Width()/2, bp.panel.Y()+bp.panel.Height()/2-bp.text.Height()/2-3+4*o.Scale)
 }
 
 func (bp *BossPanel) Update(o *UIOptions) {