slight fix
refactor some views