Update layout and clean up application view