small updates to maintain order and ensure size works for buttons