Some classes added, button implemented