Refactor home screen layout; minor UI improvements and bug fixes