Updated UI to have action buttons and targetting