Cleaned up label and test button filling code, collapsing works better now