Fixed wave view rendering; added validation

* Fixed wave view rendering
* added validation to prevent END > START