Various UI and layout improvements