feat(Styles): Tweaks styles
feat(Markup): Tweaks to markup