Seperated and cleaned up css