Commit for First part of Paint the App Red, Issue #11

This fix is for the first part of issue#11. Fix by: Sreenidhi Pundi Muralidharan. Michael Ho is doing the second part.