MC GUI

GUI changes, JUnit Test etc..