Simplified accordion, changed layout structure