UI Changes to layouts