Address @ellisonbg 's review comments,
Also clean-up rebase
fab css