Sort & style fixes