WIP
Adding submit popup
merge dan's css