Cleaning up css, updating look and feel