alignment and aesthetic fixes