Code cleanup. GUI cleanup. Added initial mapping functionality.