Add buttons in MainActivity and few improvements