uncouple capability and configuration pages

uncouple capability and configuration pages