Fixed broken settings form
Updated version