Updated to 201320 framework
Continued framework fixes + Fixed main image switching issue