Fixing misc. styling issues