Merge pull request #578 from captainnana/master

Revert to JPanels
Fixed improper character, updated pom.xml
fix derp