updated UI, fixed bugs