- Added popup icon and changed layout a bit