modified UI, almost finished