format main.html for better readability, add service tests
getting there
refactor some functionality, cleanup, refinement