Feature/deck fixes

Some simple fixes to the deck view.