wafflesgama Fixed Various UI bugs