Clean-Up Part 4

-More clean-up done.
-Fixed some issues on Add Booking, still not done...