Better class names and positions