Added popup functions and styling (To improve)