Updated general layout and link in the menu
Fixed query to find timeslots for the calendar
Paolo and I both changed the layout, changes merged