[WIP] Refactor view components