Focus area and layout fixes