layout + added solution command