Tested some map combinations
Adding some UI enhancements and rearranging source files
Merge pull request #1 from iaefai/master

Pull from original