Work towards cleaning up the pop ups and ux still some bugs