Merge AXL branch with the gui-overhaul