Code clean up + UI improvement