Just a few improvments
Added MouseListener
Clean up and preparing
More cleanup
Fixed imports