refactored ui in google format