Cleaning up code
Updated css