fix modal & press enter bugs,  cleaned up styles