working front end
adding style
merge