Bug fixes and ui improvements
V1 build completed