UI clean up part 4 + bug fixes + permission fixes