changed table layout and fixed some indentation