Some more work on the front end
Some work on styling