Fixed some UI issues.

Need to comment and stuff.

SFH