fixes, and ui work done