Major controller split; css fixes; better modal loading