ui and client improvements
fix client