reworked settings structure for client