merged changes, css and functionality together