updating initial config
fix ui problems
update mappings
general tweeks and configs