more ui work
Merge branch 'master' of github.com:akdor1154/fit3140