Misc spacing changes in client