Modified app and added views