Cleaning up css/html and adding some colors