Fixed CSS and small adjustments