Made info-popup a little better