Huge update

* Fixed visual issues
* More logic