Minor changes to improve style/layout/spacing