Remove Calendar, restructure CSS