#119: updated button layout and spinners