layout fine tuning. added buttons and fixed other semantic tags