Removed compile and runtime warnings.
Modified enhanced/overlay UI to use borders.
draw-to-remove in enhance.