bug fixess and apperearance tweaks