UI cleanup. going for notifications next