Fixes Crashes and some minor design changes
Authored by: preeteesh.kakkar 2013-05-06
Parent: [r626]
Child: [r628]
