Fixing views and adding clicks to UI