added a popup page as well. probably the biggest change