added buttons markup. made sall fixes