cleaned up code
css merge conflict