Improve general layout and styles