Import file selection CSS improvements from master