More UI Work :P
Still working on UI, also rewrote a few things to make them better