Added and modified some res/layout/*.xml files