Initial commit
Settings cleanup
Added settings