Slight refactoring and layout changes to allow more room for custom tools.