Enhance usage of context and layout