Cleaned up and added some css stuff