Updated View and added search options