restructured app, scollbars updated