Fixed some code issues
Removed rounded close button