Moved button instantiations to separate functions