Made xs design slightly better