Added popup and some styling