Work on deck screen and various fixes
Cleaned up code a bit, and progressed on Deck manager, all UI for deck manager should now be in a proper state