Some extra graphical/functional changes