Fix some html
Refactor single key view