Fixed popup

Still isnt perfect