Grid changes, shadow button shadow, close button fix