Adjust layout
Fixed close success popup