Added buttons instead of annoying text