Base: Clean up panel transition code