fixing tweaks on layout and such