cleaned up code
-removed useless boxes
-fixed margins