Fixed other minor layout issues.
Last commit now is just paranoia : )