Refined GUI more