fixed some inconsistencies in the if-else spacing and it's the return of the close buttons