bug fixes/css in progress