Removed close button from alert
Updated comments
Merged latest changes. Fixed conflicts