Various UI / UX and layout improvements