more javadoc and move emptylayout