rework in progress
rework markup and CSS