updated styles and cleand up markup