update layout, clean, simplify