Removed custom view, simplified states, fixed offset scrolling