More styles and small layout additions