Polished the spacing of ui components
Tweaked now watching component
Fixed margin
Finish minor-tweaks