1.2 Release

Code clean up
GUI clean up and additions