added app css
Merge remote-tracking branch 'origin/feature/stuff' into feature/stuff-ui
fix small bugs