Fix misalignment
Minor tweaks for responsiveness
Fix merge conflict