more fixes layout