Adapt UI to different states
Add tab view for sections