Fixing various minor styling bugs