Add bug fixes and ui update