Layout and button fixes.