Removed todo and updated setting looks and feel