Various styling fixes/updates