Lots of code removal, switched to use common lib, cosmetic GUI changes.