Minor changes and basic toolbar view