UI update for Math

Still unfinished