Clean up ui and html
clean up ui a bit and extract constants