Reorganize layout to match assignments in GL2JNIActivity