updated views, changed layout