Huge update, lighter code. Added a view !