NEW: Assignment 4 with main activity and click handlers added