Code & visual improvements

Heavy code moved to background.