Fixed some UI issues and added quit option