finished redoing si UI properly