Improved layout of smaller screens and removed stale draft.