Cleaned up temporary toolbar