A couple of fixes

Some styling issues and possible FCs