starting to add UI; cleaning stuff up