Edited layout in preparation for new look and feel