cleaned up a little bit. Labels are not right-aligned