GuiLayout for editBooking completely reviewed and done

Reviewed by: Chris
Merge origin/master