Tweaked layout and styling