merged with master
app updates
fixed bugs and added styles