Refactored to views and added fancy-select