Changed some toolbar component placements and fixed word wrapping