Minor UI improvements
Fix spinach tests