Updated layouts through context
Updated shortcuts feature module to features api 2.0