Un-break views and use _constants properly