Updated views. Fixed requirement states