UI modifications
code reformatting