Modified button behaviour