layout fix and simple workflow