Changed button library, adapted main