Improves appearance of Country and PA page

sorry for that inline SQL query
Redirect to previous page on login