Less sucky preview UX/UI

Card: http://catchup.io/boards/3/cards/74

@as-cii could you?