Started on web ui
Refactored templates