Fixed alignment issues
Minor margin fixes