Tweaked some styling, fixed some bugs