merge conflict stuff
cleaned up
form created for reservation tab
icons on top
updates to form and menu tab, ready for api
 Mikey merge
merge conflicts updated
uhhhh
 sdf
New layout