updated UI, cleaned up