Major refactor + got maptable displaying GUI