Fixing style, adding popups