fix melee view: crash and layout tweaks