Fixed some bugs and lay out issues

yep