Some UI and layout updates.