Ugly But Done

To make it look good we need to add loading screens....
Merge remote-tracking branch 'origin/Tavern_Portal'