Minor improvements layout
Minor fixes