Added more statements and fixed a few relative layout things