Added new views. Reworked workflow