cleaned up code and added better css