settings: Fix alignment issues

Change-Id: Iacc1e934822f58fbc848b426783d02b5f9c9477e
Merge "settings: Fix alignment issues"