point zero bug fix and ui clean up