fixed some xml bugs and slightly altered layout