Fixed #97, Fixed ZOrder and UI issues