Fixed bug introduced when fixing #264; reordered conditional branches for clarity
Removed + button at the top of each panel, since it no longer has its intended function