Finish OO design on main activity