a lot of front end work done
front end tweaks
fixed conflicts