Largely restored original functionality and look

Still needs substantial optimization, and a responsive review