More layout changes and moving stuff around