fixed layout problem and sorted some fields more logical