GUI Refactor + Minimap