Finished look and feel on the frontend
Merging take 2