Base options panel toggle behavior
Better content loading
Merge branch 'pr-16'
Merge branch 'pr-17'