Modified setup form layout for better use with other languages
Added config icons