Refactored views and modified settings