Refactoring + Adjusting UI