Processed most feedback and fixed the two UI issues.