touched up the xml layouts a little bit