various changes to views and layout