feature #2909: Fix accordion style
feature #2909: Fix settings layout