Fixing positioning issues and better integration of the setting table