Reworked views