merged
Added Settings menu