CSS and placement improvements