UI changes to make all views same