Fixed multiple bugs
Changed ui