fix ussue #91 and settings page