Moved to multi-controller approach, fixed CSS for retina, etc.