More updates, simplifying, adding styles and views