Settings clean up and rearrange to proper places...