Minor refactoring of gauge activity layout