Moving buttons to the right side
Updated show layout to be more like others