DeckView bugfixes