bugfixes, added xml layout