Fix widths cont., refactor buttons