Fix Math Bug, Improve UI