Added settings, minfixes, improvements on UI