Fixed some positioning and sizing issues