Fixed some popup bugs
Minor grid fixes