More syling fixes

Change-Id: I4d47d6e52cb6ec600872e2a027696d56e46bf6e0