Continued working on main interface