More styling changes + Few edge cases