Many bugfixes
Settings as modal