GUI Fixes

Made some gui fixes in the wrong branch.. oops

Author: Shockolate QuanPeng