added popup and changed layout