Application update: add scrollbar and change layout