c2c8e1d nicer layout and button