Rewrite cabin choice form population

Also limit cabin booking lengths to one week.
Remove unnused fields and add new fields to cabin