Settings layout fixes

Closes-Bug:#1340084

Change-Id: I4e7144777f96a8d2346c8d92d47a54654ec4b19b