trying to clean up
rearrange UI code from logic code
currently broken