Removed all of the &nbsp (most anyway) in favor of doing it properly with CSS