Finished OneClick and added Dialogs