Simplified click integration a bit
Simplified app finding for cli