Changed to just one frame layout