Refactor single key view (mainly)