Refactored and smoothed fill buttons.