Refactor to use better light weight views