Tweaked layout and buttons