Small layout and font tweaks
Proper width now set on all containers