UI bugfixes (thanks Max!)
Code organization
Minor PTP Bugfix