Resolving more merge conlficts, tweaked CSS width