Added nearly all popups and minor fixes