initial frontend for general settings
resolved conflict