Final styling cleanup