Further improvements
Fixed page template
Removed complete app for now