Fixed some sizing issues, tweaks