Added view managment