Rejig common views