ButtonAction added and some modifications made on Button