improve layout,  fix JS, re-add settings icons