Added view overrides + changed home context