Many bug and visual fixes