Few cosmetic changes
Font changes and related layout updates