Slight cleanup and fixing of popup
Update manifest version